From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 17 Oct 2019 12:55:25 +0000 (-0500)
Subject: Avoid a use of icon_file
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~321^2^2~696^2~6
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c3de5e36246bc82f8eab4afc840945d3c976e441;p=gtk4.git

Avoid a use of icon_file

This is a step towards getting rid of GtkIconInfo->icon_file.
---

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 7598f24d9f..cc7a6adddd 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3171,19 +3171,10 @@ gtk_icon_info_get_filename (GtkIconInfo *icon_info)
 gboolean
 gtk_icon_info_is_symbolic (GtkIconInfo *icon_info)
 {
-  gchar *icon_uri;
-  gboolean is_symbolic;
-
   g_return_val_if_fail (GTK_IS_ICON_INFO (icon_info), FALSE);
 
-  icon_uri = NULL;
-  if (icon_info->icon_file)
-    icon_uri = g_file_get_uri (icon_info->icon_file);
-
-  is_symbolic = (icon_uri != NULL) && (icon_uri_is_symbolic (icon_uri, -1));
-  g_free (icon_uri);
-
-  return is_symbolic;
+  return icon_info->filename != NULL &&
+         icon_uri_is_symbolic (icon_info->filename, -1);
 }
 
 /* If this returns TRUE, its safe to call icon_info_ensure_scale_and_texture